fix conflicts

diff --git a/src/xdisp.c b/src/xdisp.c
index 0e3d398035a14a4f6cd6b47d56d700cc57444dda..b9a16ffcc434a82d949238083cdfe131a3d11061 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -303,13 +303,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include TERM_HEADER
 #endif /* HAVE_WINDOW_SYSTEM */
 
-<<<<<<< HEAD
 #include "font.h"
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-=======
->>>>>>> trunk
 #ifndef FRAME_X_OUTPUT
 #define FRAME_X_OUTPUT(f) ((f)->output_data.x)
 #endif